projects / gpsbabel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5d5b3d9 3952179)
Merge branch 'master' of jgoerzen.
authorBernd Zeimetz <bernd@bzed.de>
Sat, 27 Dec 2008 00:52:30 +0000 (01:52 +0100)
committerBernd Zeimetz <bernd@bzed.de>
Sat, 27 Dec 2008 00:52:30 +0000 (01:52 +0100)
git://git.debian.org/git/users/jgoerzen/gpsbabel

Conflicts:

coastexp.c
debian/changelog
debian/control
debian/rules
psitrex.c
reference/coastexp.nob
reference/coastexp.ref
reference/expertgps.gpx
reference/foo.an1
uuid.c
uuid.h
vtesto


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.